Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Thu, 16 May 2013 09:58:56 +0000 (12:58 +0300)
committerEli Zaretskii <eliz@gnu.org>
Thu, 16 May 2013 09:58:56 +0000 (12:58 +0300)
commita0b58c0fb5691dc837cb8dbfe788ec3f739f8f54
tree9f1eeb1afe2cd1af79c6aec7e7608c39fff12fb3
parentdc7fe9c32fb64b696f4803fea8d72974816e6c33
parent29f5f9209fb61ba550768e39998d80c4ee662f43
Merge from trunk.
.bzrignore
Makefile.in
lisp/loadup.el
nt/makefile.w32-in
src/Makefile.in